From: Sam Steingold <sds@gnu.org>
Date: Thu, 18 Feb 2010 19:55:41 +0000 (-0500)
Subject: (vc-cvs-merge-news): Yet another fix of message parsing.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8515
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fb9cbee0a37a8d0f0499fc93174a7e8cc699ea1a;p=emacs.git

(vc-cvs-merge-news): Yet another fix of message parsing.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 242ec378288..7b839e6eeec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-18  Sam Steingold  <sds@gnu.org>
+
+	* vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
+
 2010-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Use abbreviated file names in bookmarks (bug#5591).
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index e521f608209..1abef9f48b8 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -459,8 +459,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
                        (regexp-quote
-                        (substring file (length (expand-file-name
-                                                 "." default-directory))))
+                        (substring file (1+ (length (expand-file-name
+                                                     "." default-directory)))))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond